Skip to contentSkip to conversation

Change in openvpn[master]: Delete old sample-windows file

Openvpn-devel In review flichtenheld (Code Review) 2 participants 8 messages Jun 2, 2025 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1748860734000.I15c730c9eb3f1338019577e7c665c0ca5b1edcd4@...2715...

#1 lore raw

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email

to review the following change.

Change subject: Delete old sample-windows file
......................................................................

Delete old sample-windows file

This file is apparently over 20 years old and
was never updated besides fixing some obvious
syntax errors with new versions.

So let's just get rid of it. AFAICT the Windows
installer does not use it. Only the
{server,client}.ovpn.

Github: Closes #758

Change-Id I15c730c9eb3f1338019577e7c665c0ca5b1edcd4

---
M sample/Makefile.am
D sample/sample-windows/sample.ovpn

2 files changed, 1 insertion(+), 105 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/1036/1

sample/Makefile.am +1 -3
index 9443cf3..36c3b44 100644
@@ -18,15 +18,13 @@
 EXTRA_DIST = \
 	sample-plugins \
 	sample-config-files \
-	sample-windows \
 	sample-keys \
 	sample-scripts
 
 if WIN32
 sample_DATA = \
 	client.ovpn \
-	server.ovpn \
-	sample-windows/sample.ovpn
+	server.ovpn
 
 client.ovpn: sample-config-files/client.conf
 	-rm -f client.ovpn
sample/sample-windows/sample.ovpn deleted +0 -102

102 lines not on this page · raw message

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I15c730c9eb3f1338019577e7c665c0ca5b1edcd4
Gerrit-Change-Number: 1036
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw

[Openvpn-devel] [M] Change in openvpn[master]: Delete old sample-windows file and obsolete Windows sample handling

In reply to a message not in the archive

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to reexamine a change. Please visit

    http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email

to look at the new patch set (#2).

Change subject: Delete old sample-windows file and obsolete Windows sample handling
......................................................................

Delete old sample-windows file and obsolete Windows sample handling

This file is apparently over 20 years old and
was never updated besides fixing some obvious
syntax errors with new versions.

So let's just get rid of it. AFAICT the Windows installer does not use it. Only the {server,client}.ovpn. And even there, it just uses the files directly from the build directory and does not depend on us renaming them (which is obvious since we do not use the Makefile at all in the Windows build, only CMake).

Github: Closes #758

Change-Id I15c730c9eb3f1338019577e7c665c0ca5b1edcd4

---
M sample/Makefile.am
D sample/sample-windows/sample.ovpn

2 files changed, 0 insertions(+), 117 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/1036/2

sample/Makefile.am +0 -15
index 9443cf3..4ed78a6e 100644
@@ -18,20 +18,5 @@
 EXTRA_DIST = \
 	sample-plugins \
 	sample-config-files \
-	sample-windows \
 	sample-keys \
 	sample-scripts
-
-if WIN32
-sample_DATA = \
-	client.ovpn \
-	server.ovpn \
-	sample-windows/sample.ovpn
-
-client.ovpn: sample-config-files/client.conf
-	-rm -f client.ovpn
-	cp "$(srcdir)/sample-config-files/client.conf" client.ovpn
-server.ovpn: sample-config-files/server.conf
-	-rm -f server.ovpn
-	cp "$(srcdir)/sample-config-files/server.conf" server.ovpn
-endif
sample/sample-windows/sample.ovpn deleted +0 -102

102 lines not on this page · raw message

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I15c730c9eb3f1338019577e7c665c0ca5b1edcd4
Gerrit-Change-Number: 1036
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newpatchset

#3 lore raw

[Openvpn-devel] [M] Change in openvpn[master]: Delete old sample-windows file and obsolete Windows sample handling

In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email )

Change subject: Delete old sample-windows file and obsolete Windows sample handling
......................................................................

Patch Set 2: Code-Review+2

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I15c730c9eb3f1338019577e7c665c0ca5b1edcd4
Gerrit-Change-Number: 1036
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 02 Jun 2025 15:38:30 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#4 lore raw

[Openvpn-devel] [M] Change in openvpn[master]: Delete old sample-windows file and obsolete Windows sample handling

In reply to a message not in the archive

Attention is currently required from: cron2, flichtenheld, plaisthos.

cron2 has uploaded a new patch set (#3) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2

The change is no longer submittable: Code-Review and checks~ChecksSubmitRule are unsatisfied now.

Change subject: Delete old sample-windows file and obsolete Windows sample handling
......................................................................

Delete old sample-windows file and obsolete Windows sample handling

This file is apparently over 20 years old and
was never updated besides fixing some obvious
syntax errors with new versions.

So let's just get rid of it. AFAICT the Windows installer does not use it. Only the {server,client}.ovpn. And even there, it just uses the files directly from the build directory and does not depend on us renaming them (which is obvious since we do not use the Makefile at all in the Windows build, only CMake).

Github: Closes OpenVPN/openvpn#758

Change-Id I15c730c9eb3f1338019577e7c665c0ca5b1edcd4

---
M sample/Makefile.am
D sample/sample-windows/sample.ovpn

2 files changed, 0 insertions(+), 117 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/1036/3

sample/Makefile.am +0 -15
index 9443cf3..4ed78a6e 100644
@@ -18,20 +18,5 @@
 EXTRA_DIST = \
 	sample-plugins \
 	sample-config-files \
-	sample-windows \
 	sample-keys \
 	sample-scripts
-
-if WIN32
-sample_DATA = \
-	client.ovpn \
-	server.ovpn \
-	sample-windows/sample.ovpn
-
-client.ovpn: sample-config-files/client.conf
-	-rm -f client.ovpn
-	cp "$(srcdir)/sample-config-files/client.conf" client.ovpn
-server.ovpn: sample-config-files/server.conf
-	-rm -f server.ovpn
-	cp "$(srcdir)/sample-config-files/server.conf" server.ovpn
-endif
sample/sample-windows/sample.ovpn deleted +0 -102

102 lines not on this page · raw message

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I15c730c9eb3f1338019577e7c665c0ca5b1edcd4
Gerrit-Change-Number: 1036
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset

#5 lore raw

PATCH v3 1/1 Delete old sample-windows file and obsolete Windows sample handling

In reply to a message not in the archive

From: Frank Lichtenheld <[email protected]...>

This file is apparently over 20 years old and
was never updated besides fixing some obvious
syntax errors with new versions.

So let's just get rid of it. AFAICT the Windows installer does not use it. Only the {server,client}.ovpn. And even there, it just uses the files directly from the build directory and does not depend on us renaming them (which is obvious since we do not use the Makefile at all in the Windows build, only CMake).

Github: Closes OpenVPN/openvpn#758

Change-Id I15c730c9eb3f1338019577e7c665c0ca5b1edcd4

---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1036
This mail reflects revision 3 of this Change.

Acked-by according to Gerrit (reflected above):

sample/Makefile.am +0 -15
index 9443cf3..4ed78a6e 100644
@@ -18,20 +18,5 @@
 EXTRA_DIST = \
 	sample-plugins \
 	sample-config-files \
-	sample-windows \
 	sample-keys \
 	sample-scripts
-
-if WIN32
-sample_DATA = \
-	client.ovpn \
-	server.ovpn \
-	sample-windows/sample.ovpn
-
-client.ovpn: sample-config-files/client.conf
-	-rm -f client.ovpn
-	cp "$(srcdir)/sample-config-files/client.conf" client.ovpn
-server.ovpn: sample-config-files/server.conf
-	-rm -f server.ovpn
-	cp "$(srcdir)/sample-config-files/server.conf" server.ovpn
-endif
sample/sample-windows/sample.ovpn deleted +0 -102

102 lines not on this page · raw message

#6 lore raw

[Openvpn-devel] [PATCH applied] Re: Delete old sample-windows file and obsolete Windows sample handling

Out it goes, well done :-) - checked with "make distcheck" if all the makefile magic agrees (it does).

Your patch has been applied to the master branch.

commit 1b6b1e33ed9646be97110f5cd1f31a8b2ba0dce8

Author: Frank Lichtenheld
Date:   Mon Jun 2 17:38:54 2025 +0200
     Delete old sample-windows file and obsolete Windows sample handling

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg31850.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#7 lore raw

[Openvpn-devel] [M] Change in openvpn[master]: Delete old sample-windows file and obsolete Windows sample handling

In reply to a message not in the archive

cron2 has uploaded a new patch set (#4) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email )

Change subject: Delete old sample-windows file and obsolete Windows sample handling
......................................................................

Delete old sample-windows file and obsolete Windows sample handling

This file is apparently over 20 years old and
was never updated besides fixing some obvious
syntax errors with new versions.

So let's just get rid of it. AFAICT the Windows installer does not use it. Only the {server,client}.ovpn. And even there, it just uses the files directly from the build directory and does not depend on us renaming them (which is obvious since we do not use the Makefile at all in the Windows build, only CMake).

Github: Closes OpenVPN/openvpn#758

Change-Id I15c730c9eb3f1338019577e7c665c0ca5b1edcd4

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31850.html

---
M sample/Makefile.am
D sample/sample-windows/sample.ovpn

2 files changed, 0 insertions(+), 117 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/1036/4

sample/Makefile.am +0 -15
index 9443cf3..4ed78a6e 100644
@@ -18,20 +18,5 @@
 EXTRA_DIST = \
 	sample-plugins \
 	sample-config-files \
-	sample-windows \
 	sample-keys \
 	sample-scripts
-
-if WIN32
-sample_DATA = \
-	client.ovpn \
-	server.ovpn \
-	sample-windows/sample.ovpn
-
-client.ovpn: sample-config-files/client.conf
-	-rm -f client.ovpn
-	cp "$(srcdir)/sample-config-files/client.conf" client.ovpn
-server.ovpn: sample-config-files/server.conf
-	-rm -f server.ovpn
-	cp "$(srcdir)/sample-config-files/server.conf" server.ovpn
-endif
sample/sample-windows/sample.ovpn deleted +0 -102

102 lines not on this page · raw message

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I15c730c9eb3f1338019577e7c665c0ca5b1edcd4
Gerrit-Change-Number: 1036
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#8 lore raw

[Openvpn-devel] [M] Change in openvpn[master]: Delete old sample-windows file and obsolete Windows sample handling

In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email )

Change subject: Delete old sample-windows file and obsolete Windows sample handling
......................................................................

Delete old sample-windows file and obsolete Windows sample handling

This file is apparently over 20 years old and
was never updated besides fixing some obvious
syntax errors with new versions.

So let's just get rid of it. AFAICT the Windows installer does not use it. Only the {server,client}.ovpn. And even there, it just uses the files directly from the build directory and does not depend on us renaming them (which is obvious since we do not use the Makefile at all in the Windows build, only CMake).

Github: Closes OpenVPN/openvpn#758

Change-Id I15c730c9eb3f1338019577e7c665c0ca5b1edcd4

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31850.html

---
M sample/Makefile.am
D sample/sample-windows/sample.ovpn

2 files changed, 0 insertions(+), 117 deletions(-)
sample/Makefile.am +0 -15
index 9443cf3..4ed78a6e 100644
@@ -18,20 +18,5 @@
 EXTRA_DIST = \
 	sample-plugins \
 	sample-config-files \
-	sample-windows \
 	sample-keys \
 	sample-scripts
-
-if WIN32
-sample_DATA = \
-	client.ovpn \
-	server.ovpn \
-	sample-windows/sample.ovpn
-
-client.ovpn: sample-config-files/client.conf
-	-rm -f client.ovpn
-	cp "$(srcdir)/sample-config-files/client.conf" client.ovpn
-server.ovpn: sample-config-files/server.conf
-	-rm -f server.ovpn
-	cp "$(srcdir)/sample-config-files/server.conf" server.ovpn
-endif
sample/sample-windows/sample.ovpn deleted +0 -102

102 lines not on this page · raw message

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1036?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I15c730c9eb3f1338019577e7c665c0ca5b1edcd4
Gerrit-Change-Number: 1036
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged